Add support for UNIV and RF mTCA EVR models #63

ZanMaticPratnemer · 2022-10-06T13:24:03Z

So far only IFB model is supported. This pull request adds support for UNIV and RF models. If no model is selected, the default one is picked (IFB).

ZanMaticPratnemer · 2023-04-06T06:32:10Z

evrMrmApp/src/drvemCML.cpp

-  ,mult(f==formFactor_CPCIFULL ? 40 : 20) // CML word length
-  ,wordlen(f==formFactor_CPCIFULL ? 2 : 1)// # of 32-bit dwords used to store 1 CML word
-                                      // 40 bits fit in 2 dwords, 20 bits fit in 1
+  // CML word length


This was already solved in the commit 1e82b86

jerzyjamroz · 2023-10-11T13:33:32Z

Hi, the initial conversation took place: #89

jerzyjamroz · 2023-10-11T13:41:02Z

I)

The issue I found was related to the way we use CLKA/B within the mTCA-EVR-300U MTCA backplane (the patch was in our internal repo). @ZanMaticPratnemer, please check: #94 . We deleted lines 288-292, you actually modified those in your PR. Then the .substitution config looks like: #95 and it works fine. Tested over a few years already. Could you confirm if this solution works for you?

ZanMaticPratnemer · 2023-10-11T13:50:04Z

Hi, the modification of those lines were purely visual on my end, possibly even automated by my formatter. So yeah that works for me, maybe @zioven has some other comments.

jerzyjamroz · 2023-10-11T13:58:33Z

II)

mTCA-EVR-300

mTCA-EVR-300 with IFP is discontinued and the code in line: https://github.com/epics-modules/mrfioc2/pull/63/files#diff-ec09296cb3ed989142d2d3a7eeb1fda890d403e91250f9328befd76e01fc5217R215
actually refers to a generic MTCA EVR, we have been using it for mTCA-EVR-300U and mTCA-EVR-300 (IFP) together as we have some obsolete IFP units (the FPGA images are the same, but we do not use IFP socket at all).

Your Implementation

Your implementation is cleaner so my proposal is to go for it accordingly:

mtca_evr_model variable

let's use the full names: so mtca-evr-300u, mtca-evr-300, mtca-evr-300rf, so without the introduction of the new names as the 3-rd parameter in: https://github.com/epics-modules/mrfioc2/pull/63/files#diff-c065d47a642a7070fa3a254d004c5fdf1e48b73b1e095d414262d7874ff395a7R60
if you prefer, let's add an additional explicit model e.g. mtca-evr-300ifp (so the obsolete one)

zioven · 2023-10-12T07:14:22Z

@jerzyjamroz
As @ZanMaticPratnemer has mentioned I have inherited this task and pull request from him.

Regarding I): I will be testing this with our setup and determine how the changes to TCLKA and TCLKB work on our system

Regarding II): I can rebase the changes to the master (provide a new pull request) and we can open up the discussion what is best approach and where we see the challenges/improvements.

zioven · 2023-12-15T12:50:27Z

@jerzyjamroz , @mdavidsaver

I have rebased the pull request to the latest master.

In the last commit, I have updated both 300U and 300RF substitutions file, so that they are backwards compatible:

with the current version of the GUIs
for any existing installation, that has used the default naming convention with { }

Please review and comment.

All MTCA EVRs have the CML/GTX outputs for TCLKA and TCLKB mapped to Universal Output 16 and 17 (chapters 3.7. and 3.8.) and CML/GTX logic block 0 and 1. mTCA-EVR-300RF has additional high resolution outputs mapped as: - UNIV2 : mapped to Universal Output 18 and CML/GTX logic block 2 - UNIV3 : mapped to Universal Output 19 and CML/GTX logic block 3 - GTX SFP: mapped to Universal Output 20 and CML/GTX logic block 4 - +-CML : mapped to Universal Output 21 and CML/GTX logic block 5

jerzyjamroz · 2023-12-15T13:41:19Z

@zioven I only wonder why CLKA/B works fine for mtca-evr-300u without this:

        for (unsigned int i = 16; i <= 17; ++i) {
            outputs[std::make_pair(OutputFPUniv, i)]
                = new MRMOutput(SB() << n << ":FrontUnivOut" << i, this, OutputFPUniv, i);
        }

What was not working for you that you decided to add it?

zioven · 2023-12-15T13:56:21Z

I had reports of missing objects evrN:FrontUnivOutX for TCLKA and TCLKB similar to this:

smpl{evrN-Out:FP0}Src-RB_: failed to find/create object 'evr2:FrontOut0' : Object not found : evr2:FrontOut0  
smpl{evrN-Out:FP0}Src2-RB_: failed to find/create object 'evr2:FrontOut0' : Object not found : evr2:FrontOut0 
smpl{evrN-Out:FP1}Src-RB_: failed to find/create object 'evr2:FrontOut1' : Object not found : evr2:FrontOut1  
smpl{evrN-Out:FP1}Src2-RB_: failed to find/create object 'evr2:FrontOut1' : Object not found : evr2:FrontOut1 
smpl{evrN-Out:FP2}Src-RB_: failed to find/create object 'evr2:FrontOut2' : Object not found : evr2:FrontOut2  
smpl{evrN-Out:FP2}Src2-RB_: failed to find/create object 'evr2:FrontOut2' : Object not found : evr2:FrontOut2 
smpl{evrN-Out:FP3}Src-RB_: failed to find/create object 'evr2:FrontOut3' : Object not found : evr2:FrontOut3  
smpl{evrN-Out:FP3}Src2-RB_: failed to find/create object 'evr2:FrontOut3' : Object not found : evr2:FrontOut3

NOTE: Errors above occurred when I loaded the evr-mtca-300u.db while initializing for mTCA-EVR-300RF card, which does not have any permanent Front Outputs.

jerzyjamroz · 2023-12-15T15:27:28Z

I use the actual master this moment and the objects are fine:

Object: EVR:FrontOut0
Type: 9MRMOutput
Object: EVR:FrontOut1
Type: 9MRMOutput
Object: EVR:FrontOut2
Type: 9MRMOutput
Object: EVR:FrontOut3
Type: 9MRMOutput

@zioven , try this file: evr-mtca-300.db, maybe your setup has some dependencies on some special characters.

zioven · 2023-12-18T14:20:25Z

@jerzyjamroz
The message above is just an example of the missing objects that I got for my mTCA-EVR-300U card.
If I didn't create the FrontUnivOut objects for TCLKA and TCLKB outputs, I got a similar error.

According to Jukka's document, TCLKA and TCLKB outputs are mapped as following:

TCLKA : Universal Output 16
TCLKB : Universal Output 17

In current config (see code reference below), the number of FPUV Outputs is set to 18 (assuming this is the IFB version of EVR, 16 on the interface box + 2 which correspond to TCLKA and TCLKB)

mrfioc2/evrMrmApp/src/drvemSetup.cpp

Lines 176 to 194 in 277abf2

    
           static const EVRMRM::Config mtca_evr_300 = { 
        
               "mTCA-EVR-300", 
        
               16, // pulse generators 
        
               8,  // prescalers 
        
               4,  // FP outputs 
        
               18, // Univ outputs (16 via external IFB + 2 handled specially) 
        
               10, // RB outputs (10 EVRTM) 
        
               8,  // Backplane outputs 
        
               2,  // FP Delay outputs 
        
               0,  // CML/GTX outputs 
        
               MRMCML::typeTG300, 
        
               /** 
        
                * 0 <= N <= 3   : FPInMap 
        
                * 4 <= N <= 23  : UnivInMap 
        
                * 24 <= N <= 31 : BPInMap 
        
                * 48 - 57 : TBInMap (EVRTM) 
        
                */ 
        
               58, // FP, Univ, BP, TB inputs 
        
           };

With the addition of the mTCA-EVR-300U and mTCA-EVR-300RF the number of FPUV Outputs is less than that.

in case of mTCA-EVR-300U: 4
in case of mTCA-EVR-300RF*: 2

In my opinion it doesn't make sense to create 18 objects, from which only 6 or 4 shall be used.

Based on this conclusion, I have added a separate creation of objects (for TLCKA and TCLKB) for FrontUnivOut16, FrontUnivOut17 on all platforms, and reduced the number of FPUV modules on generic mtca_evr_300 configuration to 16 (as is the actual number of Front Universal Outputs).

mTCA-EVR-300RF* details

(additional 2 on the front panel , that are GTX and linked to `Universal Output 18` and `Universal Output 19` are also created separately)

jerzyjamroz · 2023-12-27T13:11:29Z

@zioven , I got your point, you are right it is a cleaner solution.

I just noticed that you found the reverse solution for the .substitution implementation. I was just thinking of adding more .substitution files if needed e.g.

.substitution - old naming,
.uv.substitution - universal naming.

but both implementations can be used.

Add vs2022

ZanMaticPratnemer marked this pull request as draft October 7, 2022 07:37

ZanMaticPratnemer force-pushed the mtca-rf-and-mtca-univ branch from f5dbb33 to 1a33737 Compare October 7, 2022 11:23

ZanMaticPratnemer marked this pull request as ready for review October 7, 2022 11:24

ZanMaticPratnemer commented Apr 6, 2023

View reviewed changes

zioven mentioned this pull request Oct 9, 2023

Add support for MTCA EVR 300U and 300RF #89

Closed

jerzyjamroz added the feature label Oct 10, 2023

jerzyjamroz self-assigned this Oct 10, 2023

jerzyjamroz marked this pull request as draft October 10, 2023 08:43

jerzyjamroz requested a review from javicereijo October 11, 2023 14:03

jerzyjamroz linked an issue Oct 12, 2023 that may be closed by this pull request

Add support for MTCA EVR 300U and 300RF #89

Closed

jerzyjamroz mentioned this pull request Oct 13, 2023

To align handling of the GTX outputs and #63 PR. #96

Closed

jerzyjamroz linked an issue Oct 13, 2023 that may be closed by this pull request

To align handling of the GTX outputs and #63 PR. #96

Closed

zioven force-pushed the mtca-rf-and-mtca-univ branch from 2d49873 to 34076cd Compare December 6, 2023 11:31

zioven force-pushed the mtca-rf-and-mtca-univ branch from 34076cd to cd22577 Compare December 15, 2023 10:16

jerzyjamroz force-pushed the mtca-rf-and-mtca-univ branch from cd22577 to 02ae593 Compare December 15, 2023 13:29

ZanMaticPratnemer and others added 8 commits December 15, 2023 14:35

Add suport for mTCA UNIV EVR

6b50f91

Add support for mTCA RF EVR

d2d0bd2

Add evr-mtca-300u substitution file

50bc3a6

fix: Added $(s=:) macro for the : separator.

0c26c81

fix: Default MTCA EVR and formFactor_mTCA sub mapping.

8b103da

fix: mtca_evr_300ifb setup adjusted to its capabilities.

5d5be72

Adopting the new naming convetion for the new substitutions files

4c5f21f

jerzyjamroz force-pushed the mtca-rf-and-mtca-univ branch from 02ae593 to 4c5f21f Compare December 15, 2023 13:35

jerzyjamroz marked this pull request as ready for review December 15, 2023 13:38

jerzyjamroz self-requested a review as a code owner December 15, 2023 13:38

jerzyjamroz requested a review from mdavidsaver December 15, 2023 13:41

jerzyjamroz merged commit b66485f into epics-modules:master Dec 27, 2023
11 checks passed

jerzyjamroz mentioned this pull request Dec 28, 2023

feat: Better handling of GTX within formFactor_mTCA. #110

Merged

zioven deleted the mtca-rf-and-mtca-univ branch January 4, 2024 10:50

jerzyjamroz pushed a commit to jerzyjamroz/mrfioc2 that referenced this pull request Oct 10, 2024

Merge pull request epics-modules#63 from mdavidsaver/vs2022

89a16e4

Add vs2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for UNIV and RF mTCA EVR models #63

Add support for UNIV and RF mTCA EVR models #63

ZanMaticPratnemer commented Oct 6, 2022

ZanMaticPratnemer Apr 6, 2023

jerzyjamroz commented Oct 11, 2023

jerzyjamroz commented Oct 11, 2023 •

edited

Loading

ZanMaticPratnemer commented Oct 11, 2023

jerzyjamroz commented Oct 11, 2023

zioven commented Oct 12, 2023

zioven commented Dec 15, 2023

jerzyjamroz commented Dec 15, 2023

zioven commented Dec 15, 2023 •

edited

Loading

jerzyjamroz commented Dec 15, 2023 •

edited

Loading

zioven commented Dec 18, 2023

jerzyjamroz commented Dec 27, 2023 •

edited

Loading

Add support for UNIV and RF mTCA EVR models #63

Add support for UNIV and RF mTCA EVR models #63

Conversation

ZanMaticPratnemer commented Oct 6, 2022

ZanMaticPratnemer Apr 6, 2023

Choose a reason for hiding this comment

jerzyjamroz commented Oct 11, 2023

jerzyjamroz commented Oct 11, 2023 • edited Loading

I)

ZanMaticPratnemer commented Oct 11, 2023

jerzyjamroz commented Oct 11, 2023

II)

mTCA-EVR-300

Your Implementation

zioven commented Oct 12, 2023

zioven commented Dec 15, 2023

jerzyjamroz commented Dec 15, 2023

zioven commented Dec 15, 2023 • edited Loading

jerzyjamroz commented Dec 15, 2023 • edited Loading

zioven commented Dec 18, 2023

jerzyjamroz commented Dec 27, 2023 • edited Loading

jerzyjamroz commented Oct 11, 2023 •

edited

Loading

zioven commented Dec 15, 2023 •

edited

Loading

jerzyjamroz commented Dec 15, 2023 •

edited

Loading

jerzyjamroz commented Dec 27, 2023 •

edited

Loading